diff --git a/paddle/fluid/framework/details/var_handle.h b/paddle/fluid/framework/details/var_handle.h
index ae23e3b1f8d04d40f7ccffd22b6b3ac2a1462138..ba8b38d1e706c7501e855bbf51925d3090dbc5a6 100644
--- a/paddle/fluid/framework/details/var_handle.h
+++ b/paddle/fluid/framework/details/var_handle.h
@@ -56,7 +56,8 @@ struct VarHandleBase {
 
   void RemoveOutput(OpHandleBase* out, ir::Node* node) {
     pending_ops_.erase(out);
-    std::remove(node_->outputs.begin(), node_->outputs.end(), node);
+    node_->outputs.erase(
+        std::remove(node_->outputs.begin(), node_->outputs.end(), node));
   }
 
   void ClearGeneratedOp() {
diff --git a/paddle/fluid/framework/ir/graph.h b/paddle/fluid/framework/ir/graph.h
index 3c268682afebe8a831b7cfd5f484c5fd8814c6dc..2ab018dd85941f13ea03d54ecad3ee78b5e7a73f 100644
--- a/paddle/fluid/framework/ir/graph.h
+++ b/paddle/fluid/framework/ir/graph.h
@@ -64,9 +64,6 @@ class Graph {
     return nodes.back().get();
   }
 
-  // TODO(paddle-dev): There shouldn't be kNone nodes in the ir::Graph.
-  // node should either be a executable kOperation or a kVariable. kNone
-  // node is a temporary solution.
   ir::Node* CreateEmptyNode(const std::string& name, ir::Node::Type type) {
     nodes.emplace_back(new ir::Node(name, type));
     return nodes.back().get();