3 files changed, 0 insertions, 10 deletions
diff --git a/lib/command.c b/lib/command.c
index 84d59f076c..eb163f6189 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -865,8 +865,6 @@ node_parent ( enum node_type node )
     {
     case BGP_VPNV4_NODE:
     case BGP_VPNV6_NODE:
-    case BGP_ENCAP_NODE:
-    case BGP_ENCAPV6_NODE:
     case BGP_VRF_POLICY_NODE:
     case BGP_VNC_DEFAULTS_NODE:
     case BGP_VNC_NVE_GROUP_NODE:
@@ -1238,8 +1236,6 @@ cmd_exit (struct vty *vty)
     case BGP_IPV4L_NODE:
     case BGP_VPNV4_NODE:
     case BGP_VPNV6_NODE:
-    case BGP_ENCAP_NODE:
-    case BGP_ENCAPV6_NODE:
     case BGP_VRF_POLICY_NODE:
     case BGP_VNC_DEFAULTS_NODE:
     case BGP_VNC_NVE_GROUP_NODE:
@@ -1305,8 +1301,6 @@ DEFUN (config_end,
     case RIPNG_NODE:
     case EIGRP_NODE:
     case BGP_NODE:
-    case BGP_ENCAP_NODE:
-    case BGP_ENCAPV6_NODE:
     case BGP_VRF_POLICY_NODE:
     case BGP_VNC_DEFAULTS_NODE:
     case BGP_VNC_NVE_GROUP_NODE:
diff --git a/lib/command.h b/lib/command.h
index 35fb20f8b0..7894334dfc 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -101,8 +101,6 @@ enum node_type
   BGP_IPV6_NODE,                /* BGP IPv6 address family */
   BGP_IPV6M_NODE,               /* BGP IPv6 multicast address family. */
   BGP_IPV6L_NODE,               /* BGP IPv6 labeled unicast address family. */
-  BGP_ENCAP_NODE,               /* BGP ENCAP SAFI */
-  BGP_ENCAPV6_NODE,             /* BGP ENCAP SAFI */
   BGP_VRF_POLICY_NODE,          /* BGP VRF policy */
   BGP_VNC_DEFAULTS_NODE,	/* BGP VNC nve defaults */
   BGP_VNC_NVE_GROUP_NODE,	/* BGP VNC nve group */
diff --git a/lib/vty.c b/lib/vty.c
index e27f8d74ba..c500a45194 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -738,8 +738,6 @@ vty_end_config (struct vty *vty)
     case BGP_NODE:
     case BGP_VPNV4_NODE:
     case BGP_VPNV6_NODE:
-    case BGP_ENCAP_NODE:
-    case BGP_ENCAPV6_NODE:
     case BGP_VRF_POLICY_NODE:
     case BGP_VNC_DEFAULTS_NODE:
     case BGP_VNC_NVE_GROUP_NODE: