diff --git a/proto/bmp/bmp.c b/proto/bmp/bmp.c
index 188157ad..dafa67b2 100644
--- a/proto/bmp/bmp.c
+++ b/proto/bmp/bmp.c
@@ -639,7 +639,8 @@ bmp_add_peer(struct bmp_proto *p, ea_list *bgp_attr)
   HASH_INSERT(p->peer_map, HASH_PEER, bp);
 
   int proto_id = ea_get_int(bgp_attr, &ea_proto_id, 0);
-  
+ 
+#if 0 /* XXXXX FIXME */ 
   struct channel_attrs *chan_attr;
   log("before while id %i, eattrs %i", proto_id, proto_state_table->channels_attrs[proto_id]);
   WALK_LIST(chan_attr, proto_state_table->channels_attrs[proto_id])
@@ -654,6 +655,7 @@ bmp_add_peer(struct bmp_proto *p, ea_list *bgp_attr)
     if (p->monitoring_rib.in_post_policy && ch_table)
       bmp_add_stream(p, bp, ea_get_int(chan_attr->attrs, &ea_bgp_afi, 0), true, ch_table, chan_attr->attrs, 0);
   }
+#endif
 
   return bp;
 }
@@ -661,9 +663,11 @@ bmp_add_peer(struct bmp_proto *p, ea_list *bgp_attr)
 static void
 bmp_remove_peer(struct bmp_proto *p, struct bmp_peer *bp)
 {
+  /*
   struct bmp_stream *bs, *bs_next;
   WALK_LIST_DELSAFE(bs, bs_next, bp->streams)
     bmp_remove_stream(p, bs);
+    */
 
   HASH_REMOVE(p->peer_map, HASH_PEER, bp);