diff --git a/paddle/operators/recv_op.cc b/paddle/operators/recv_op.cc
index dad5cf372e43e403fc11fe8f349b21b28d90107d..978ce92d241af5108e896c36c082bd55b6cc0b5e 100644
--- a/paddle/operators/recv_op.cc
+++ b/paddle/operators/recv_op.cc
@@ -90,6 +90,7 @@ class RecvOp : public framework::OperatorBase {
     platform::DeviceContextPool &pool = platform::DeviceContextPool::Instance();
     auto &dev_ctx = *pool.Get(dev_place);
 
+    // FIXME(Yancey1989): initialize rpc server with laze mode.
     rpc_service_->SetScope(&recv_scope);
     rpc_service_->SetDevCtx(&dev_ctx);
     auto param_list = Attr<std::vector<std::string>>("ParamList");
diff --git a/paddle/operators/send_op.cc b/paddle/operators/send_op.cc
index a82c3430e9d63a268571f2c7e96df77ee3dc93a2..1e6d659180bf71570d71fdb603392a5ff72b1f6e 100644
--- a/paddle/operators/send_op.cc
+++ b/paddle/operators/send_op.cc
@@ -38,8 +38,6 @@ class SendOp : public framework::OperatorBase {
     auto outs = Outputs("Out");
     std::vector<std::string> epmap = Attr<std::vector<std::string>>("epmap");
 
-    // FIXME(gongwb): DeviceContext?
-    // auto ctx = platform::CPUDeviceContext();
     platform::DeviceContextPool& pool = platform::DeviceContextPool::Instance();
     auto& ctx = *pool.Get(place);
     for (size_t i = 0; i < ins.size(); i++) {