diff --git a/src/runtime/rpc/rpc_host_port.h b/src/runtime/rpc/rpc_host_port.h
index 49af9843f4..bed900d7a7 100644
--- a/src/runtime/rpc/rpc_host_port.h
+++ b/src/runtime/rpc/rpc_host_port.h
@@ -41,31 +41,6 @@ class TProtocol;
 } // namespace thrift
 } // namespace apache
 
-#define FILL_HP_OPTIONAL_SECTION(OBJ_NAME, SECTION_NAME)                                           \
-    do {                                                                                           \
-        host_port hp(OBJ_NAME.SECTION_NAME);                                                       \
-        OBJ_NAME.__set_hp_##SECTION_NAME(hp);                                                      \
-    } while (false)
-
-#define FILL_HP_LIST_OPTIONAL_SECTION(OBJ_NAME, SECTION_NAME)                                      \
-    do {                                                                                           \
-        std::vector<host_port> hps;                                                                \
-        dsn::host_port::fill_host_ports_from_addresses(OBJ_NAME.SECTION_NAME, hps);                \
-        OBJ_NAME.__set_hp_##SECTION_NAME(hps);                                                     \
-    } while (false)
-
-#define FILL_OPTIONAL_HP_IF_NEEDED(OBJ_NAME, SECTION_NAME)                                         \
-    do {                                                                                           \
-        if (!OBJ_NAME.__isset.hp_##SECTION_NAME)                                                   \
-            FILL_HP_OPTIONAL_SECTION(OBJ_NAME, SECTION_NAME);                                      \
-    } while (false)
-
-#define FILL_OPTIONAL_HP_LIST_IF_NEEDED(OBJ_NAME, SECTION_NAME)                                    \
-    do {                                                                                           \
-        if (!OBJ_NAME.__isset.hp_##SECTION_NAME)                                                   \
-            FILL_HP_LIST_OPTIONAL_SECTION(OBJ_NAME, SECTION_NAME);                                 \
-    } while (false)
-
 namespace dsn {
 
 class rpc_group_host_port;