diff --git a/api/result.go b/api/result.go
index bcf72f3..9c74181 100644
--- a/api/result.go
+++ b/api/result.go
@@ -29,8 +29,6 @@ func (a *API) ExecutionResult(ctx echo.Context) error {
 		return ctx.NoContent(http.StatusNotFound)
 	}
 
-	// TODO: Output format fixed.
-
 	// Send the response back.
 	return ctx.JSON(http.StatusOK, result)
 }
diff --git a/node/execution_results.go b/node/execution_results.go
index a7539c4..f14e44e 100644
--- a/node/execution_results.go
+++ b/node/execution_results.go
@@ -132,7 +132,6 @@ func (n *Node) gatherExecutionResults(ctx context.Context, requestID string, pee
 		go func() {
 			defer wg.Done()
 			key := executionResultKey(requestID, rp)
-			// XXX: cache response.Execute
 			res, ok := n.executeResponses.WaitFor(exctx, key)
 			if !ok {
 				return