diff --git a/tensorstore/driver/zarr3/driver.cc b/tensorstore/driver/zarr3/driver.cc
index f86e4ad88..f65533197 100644
--- a/tensorstore/driver/zarr3/driver.cc
+++ b/tensorstore/driver/zarr3/driver.cc
@@ -737,8 +737,6 @@ class ZarrDriver : public ZarrDriverBase {
     if (metadata.fill_value.empty()) {
       return SharedArray<const void>();
     }
-    // return metadata.fill_value[0];
-    // TODO: Doe we actually need to validate this or can we trust that component_index will return a valid index?
     size_t index = this->component_index();
     if (index >= metadata.fill_value.size()) {
         return absl::OutOfRangeError("Component index out of bounds");
diff --git a/tensorstore/driver/zarr3/dtype_test.cc b/tensorstore/driver/zarr3/dtype_test.cc
index 709178bc3..a41830069 100644
--- a/tensorstore/driver/zarr3/dtype_test.cc
+++ b/tensorstore/driver/zarr3/dtype_test.cc
@@ -17,7 +17,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <cstddef>  // for std::byte
 #include <string>
 #include <vector>