diff --git a/internal/graphicsdriver/metal/buffer.go b/internal/graphicsdriver/metal/buffer.go
index c6b457c3c..c83f86214 100644
--- a/internal/graphicsdriver/metal/buffer.go
+++ b/internal/graphicsdriver/metal/buffer.go
@@ -29,6 +29,8 @@ import (
 //
 // static int count(void* obj) {
 //   // TODO: Don't rely on the number of ref counts. CFGetRetainCount should be used only for debugging.
+//   // Note that checking whether MTLCommandBuffer's status is completed or not does not work, because the
+//   // CommandBuffer might still be used even in such situation.
 //   return CFGetRetainCount(obj);
 // }
 import "C"
diff --git a/internal/graphicsdriver/metal/driver.go b/internal/graphicsdriver/metal/driver.go
index 87bc14d7e..64cc4f413 100644
--- a/internal/graphicsdriver/metal/driver.go
+++ b/internal/graphicsdriver/metal/driver.go
@@ -494,7 +494,6 @@ func (d *Driver) Reset() error {
 }
 
 func (d *Driver) Draw(indexLen int, indexOffset int, mode graphics.CompositeMode, colorM *affine.ColorM, filter graphics.Filter, address graphics.Address) error {
-	// TODO: Use address
 	if err := mainthread.Run(func() error {
 		// NSView can be changed anytime (probably). Set this everyframe.
 		cocoaWindow := ns.NewWindow(unsafe.Pointer(d.window))