diff --git a/aot/src/main/java/com/dylibso/chicory/aot/AotMethods.java b/aot/src/main/java/com/dylibso/chicory/aot/AotMethods.java
index 68f1553bb..594ee5de2 100644
--- a/aot/src/main/java/com/dylibso/chicory/aot/AotMethods.java
+++ b/aot/src/main/java/com/dylibso/chicory/aot/AotMethods.java
@@ -175,7 +175,6 @@ public static long[] callIndirect(
             throw new ChicoryException("uninitialized element " + funcTableIdx);
         }
 
-        // TODO: this check can be performed statically, I guess
         FunctionType expectedType = instance.type(typeId);
         FunctionType actualType = instance.type(instance.functionType(funcId));
         if (!actualType.typesMatch(expectedType)) {
@@ -183,9 +182,6 @@ public static long[] callIndirect(
         }
 
         checkInterruption();
-        // TODO: verify
-        // here we should not pass through the external "call" method
-        // but directly emit the invocation of the underlying function
         return instance.getMachine().call(funcId, args);
     }