summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-01-14 17:33:59 +0100
committerChristian Poessinger <christian@poessinger.com>2021-01-14 17:33:59 +0100
commit4cd2ab8738d8802868e387d67a011b1055e709ed (patch)
tree8d5845e1fe9f723d95f93f83e7b3be59d9151e1e
parent140668ff36bc17e7d5171a936b0850a2a0bb48ce (diff)
downloadvyatta-cfg-quagga-4cd2ab8738d8802868e387d67a011b1055e709ed.tar.gz
vyatta-cfg-quagga-4cd2ab8738d8802868e387d67a011b1055e709ed.zip
bgp: T2174: move implementation to vyos-1x
-rw-r--r--templates/protocols/bgp/node.def15
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.tag/as-set/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.tag/summary-only/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.def5
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.tag/backdoor/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.tag/route-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/metric/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/route-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/metric/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/route-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/metric/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/route-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/metric/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/route-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/metric/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/route-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/table/node.def10
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.def5
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.tag/summary-only/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.def5
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.tag/path-limit/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.tag/route-map/node.def10
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/metric/node.def3
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/route-map/node.def9
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/metric/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/route-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/metric/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/route-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/metric/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/route-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/metric/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/route-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/address-family/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/maximum-paths/ebgp/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/maximum-paths/ibgp/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/maximum-paths/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.def9
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/allowas-in/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/allowas-in/number/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/as-override/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/as-path/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/med/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/next-hop/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/receive/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/send/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/default-originate/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/default-originate/route-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/export/node.def10
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/import/node.def10
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/export/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/import/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/maximum-prefix/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/nexthop-self/force/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/nexthop-self/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/export/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/import/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/remove-private-as/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/export/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/import/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-reflector-client/node.def5
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-server-client/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/soft-reconfiguration/inbound/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/soft-reconfiguration/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/unsuppress-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/weight/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/allowas-in/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/allowas-in/number/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/as-path/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/med/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/next-hop/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/dynamic/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/receive/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/send/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/extended/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/standard/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/export/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/import/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/maximum-prefix/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-local/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-local/unchanged/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-self/force/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-self/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/peer-group/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def9
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def10
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/remove-private-as/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/export/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/import/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-reflector-client/node.def5
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-server-client/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/bfd/check-control-plane-failure/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/bfd/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/capability/extended-nexthop/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/description/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/interface/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/interface/peer-group/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/interface/remote-as/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/peer-group/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/remote-as/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def16
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.tag/no-prepend/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.tag/no-prepend/replace-as/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def5
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/timers/connect/node.def5
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/timers/holdtime/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/timers/keepalive/node.def5
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def5
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/hops/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def5
-rw-r--r--templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/as-path/multipath-relax/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/as-path/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/med/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/cluster-id/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/confederation/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/parameters/dampening/half-life/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/dampening/max-suppress-time/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/parameters/dampening/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/parameters/dampening/re-use/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/parameters/dampening/start-suppress-time/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def3
-rw-r--r--templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/default/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/distance/global/external/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/distance/global/internal/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/distance/global/local/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/distance/global/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/distance/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/distance/prefix/node.def5
-rw-r--r--templates/protocols/bgp/node.tag/parameters/distance/prefix/node.tag/distance/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/graceful-restart/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/network-import-check/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/parameters/router-id/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/allowas-in/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/allowas-in/number/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/as-path/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/med/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/next-hop/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/dynamic/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/receive/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/send/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/default-originate/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/default-originate/route-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/extended/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/standard/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/export/node.def10
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/import/node.def10
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/export/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/import/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/maximum-prefix/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/nexthop-self/force/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/nexthop-self/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/export/node.def8
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/import/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/remove-private-as/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/export/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/import/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-reflector-client/node.def5
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-server-client/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/soft-reconfiguration/inbound/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/soft-reconfiguration/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/unsuppress-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/weight/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/allowas-in/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/allowas-in/number/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/as-path/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/med/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/next-hop/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/dynamic/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/receive/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/send/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/extended/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/standard/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/export/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/import/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/maximum-prefix/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-local/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-local/unchanged/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-self/force/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-self/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/node.def3
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def8
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/remove-private-as/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/export/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/import/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-reflector-client/node.def5
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-server-client/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/bfd/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/capability/dynamic/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/capability/extended-nexthop/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/capability/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/description/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/disable-capability-negotiation/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/disable-connected-check/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/ebgp-multihop/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/local-as/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/local-as/node.tag/no-prepend/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/override-capability/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/passive/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/password/node.def8
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/remote-as/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/shutdown/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/hops/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/update-source/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/route-map/node.def8
-rw-r--r--templates/protocols/bgp/node.tag/timers/holdtime/node.def8
-rw-r--r--templates/protocols/bgp/node.tag/timers/keepalive/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/timers/node.def3
312 files changed, 0 insertions, 969 deletions
diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def
deleted file mode 100644
index 08c0a91a..00000000
--- a/templates/protocols/bgp/node.def
+++ /dev/null
@@ -1,15 +0,0 @@
-tag:1
-priority: 730
-type: u32
-help: Border Gateway Protocol (BGP) parameters
-val_help: u32:1-4294967294; AS number
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294 ; \
- "AS number must be between 1 and 4294967294"
-
-end: if [ -z "$VAR(.)" ] || [ "$COMMIT_ACTION" != DELETE ]; then
- /opt/vyatta/sbin/vyatta-bgp.pl --main
- vtysh -d bgpd -c 'sh run' > /opt/vyatta/etc/quagga/bgpd.conf
- else
- rm -f /opt/vyatta/etc/quagga/bgpd.conf
- fi
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.def
deleted file mode 100644
index 84b4222e..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-tag:
-type: ipv4net
-help: BGP aggregate network
-syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.tag/as-set/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.tag/as-set/node.def
deleted file mode 100644
index 3de1c8ec..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.tag/as-set/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Generate AS-set path information for this aggregate address
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.tag/summary-only/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.tag/summary-only/node.def
deleted file mode 100644
index e68ae9b6..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.tag/summary-only/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Announce the aggregate summary network only
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.def
deleted file mode 100644
index 1a86f394..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-tag:
-type: ipv4net
-help: BGP network
-syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
-commit:expression: !($VAR(./backdoor/) != "" && $VAR(./route-map/) != ""); "you may specify route-map or backdoor but not both"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.tag/backdoor/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.tag/backdoor/node.def
deleted file mode 100644
index a350af44..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.tag/backdoor/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Network as a backdoor route
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.tag/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.tag/route-map/node.def
deleted file mode 100644
index 58ac22b7..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.tag/route-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route-map to modify route attributes
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/node.def
deleted file mode 100644
index ea485a15..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: IPv4 BGP settings
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/metric/node.def
deleted file mode 100644
index 43f1ffff..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/metric/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: u32
-help: Metric for redistributed routes
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/node.def
deleted file mode 100644
index 0b095c32..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Redistribute connected routes into BGP
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/route-map/node.def
deleted file mode 100644
index 3d61955a..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/connected/route-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route map to filter redistributed routes
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/metric/node.def
deleted file mode 100644
index 43f1ffff..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/metric/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: u32
-help: Metric for redistributed routes
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/node.def
deleted file mode 100644
index 2becf6c4..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Redistribute kernel routes into BGP
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/route-map/node.def
deleted file mode 100644
index 3d61955a..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/kernel/route-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route map to filter redistributed routes
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/node.def
deleted file mode 100644
index d8312d74..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Redistribute routes from other protocols into BGP
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/metric/node.def
deleted file mode 100644
index 43f1ffff..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/metric/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: u32
-help: Metric for redistributed routes
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/node.def
deleted file mode 100644
index 7c92d26d..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Redistribute OSPF routes into BGP
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/route-map/node.def
deleted file mode 100644
index 3d61955a..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/ospf/route-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route map to filter redistributed routes
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/metric/node.def
deleted file mode 100644
index 43f1ffff..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/metric/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: u32
-help: Metric for redistributed routes
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/node.def
deleted file mode 100644
index 5b2e31b8..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Redistribute RIP routes into BGP
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/route-map/node.def
deleted file mode 100644
index 3d61955a..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/rip/route-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route map to filter redistributed routes
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/metric/node.def
deleted file mode 100644
index 43f1ffff..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/metric/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: u32
-help: Metric for redistributed routes
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/node.def
deleted file mode 100644
index b7f8b390..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Redistribute static routes into BGP
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/route-map/node.def
deleted file mode 100644
index 3d61955a..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/static/route-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route map to filter redistributed routes
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/table/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/table/node.def
deleted file mode 100644
index 7aae952e..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/redistribute/table/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-multi:
-type: txt
-help: Redistribute non-main Kernel Routing Table
-allowed: local -a params
- eval "params=($(cli-shell-api listNodes protocols static table))"
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"protocols static table $VAR(@)\" ";"static table $VAR(@) doesn't exist"
-create:expression: "vtysh -c \"configure terminal\" -c \"router bgp $VAR(../../../../@)\" -c \"address-family ipv4\" -c \"redistribute table $VAR(@)\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router bgp $VAR(../../../../@)\" -c \"address-family ipv4\" -c \"no redistribute table $VAR(@)\" "
-
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.def
deleted file mode 100644
index fa7a9ae4..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-tag:
-type: ipv6net
-help: BGP IPv6 aggregate network
-val_help: IPv6 aggregate network
-syntax:expression: exec "ipaddrcheck --verbose --is-ipv6-net $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.tag/summary-only/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.tag/summary-only/node.def
deleted file mode 100644
index e68ae9b6..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.tag/summary-only/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Announce the aggregate summary network only
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.def
deleted file mode 100644
index 41256748..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-tag:
-type: ipv6net
-help: BGP IPv6 network
-val_help: IPv6 network
-syntax:expression: exec "ipaddrcheck --verbose --is-ipv6-net $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.tag/path-limit/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.tag/path-limit/node.def
deleted file mode 100644
index 74779030..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.tag/path-limit/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: u32
-help: AS-path hopcount limit
-val_help: u32:0-255; AS path hop count limit
-
-commit:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "path-limit must be between 0-255."
-commit:expression: $VAR(../route-map/) == ""; "you can't set path-limit and route-map for network"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.tag/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.tag/route-map/node.def
deleted file mode 100644
index 292a88af..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.tag/route-map/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: txt
-help: Route-map to modify route attributes
-val_help: Route map name
-
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
-commit:expression: $VAR(../path-limit/) == ""; "you can't set route-map and path-limit for network"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/node.def
deleted file mode 100644
index ef8520d4..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: BGP IPv6 settings
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/metric/node.def
deleted file mode 100644
index 43d42f8d..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/metric/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: u32
-help: Metric for redistributed routes
-val_help: Metric for redistributed routes
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/node.def
deleted file mode 100644
index 0b095c32..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Redistribute connected routes into BGP
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/route-map/node.def
deleted file mode 100644
index b6b83263..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/route-map/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: txt
-help: Route map to filter redistributed routes
-val_help: Route map name
-
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/metric/node.def
deleted file mode 100644
index 43f1ffff..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/metric/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: u32
-help: Metric for redistributed routes
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/node.def
deleted file mode 100644
index 3160951b..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Redistribute kernel routes into BGP
-
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/route-map/node.def
deleted file mode 100644
index 3d61955a..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/route-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route map to filter redistributed routes
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/node.def
deleted file mode 100644
index d8312d74..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Redistribute routes from other protocols into BGP
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/metric/node.def
deleted file mode 100644
index 43f1ffff..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/metric/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: u32
-help: Metric for redistributed routes
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/node.def
deleted file mode 100644
index 0181f155..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Redistribute OSPFv3 routes into BGP
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/route-map/node.def
deleted file mode 100644
index 3d61955a..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/route-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route map to filter redistributed routes
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/metric/node.def
deleted file mode 100644
index 43f1ffff..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/metric/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: u32
-help: Metric for redistributed routes
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/node.def
deleted file mode 100644
index 1631b384..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Redistribute RIPng routes into BGP
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/route-map/node.def
deleted file mode 100644
index 3d61955a..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/route-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route map to filter redistributed routes
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/metric/node.def
deleted file mode 100644
index 43f1ffff..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/metric/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: u32
-help: Metric for redistributed routes
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/node.def
deleted file mode 100644
index b7f8b390..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Redistribute static routes into BGP
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/route-map/node.def
deleted file mode 100644
index 3d61955a..00000000
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/route-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route map to filter redistributed routes
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/address-family/node.def b/templates/protocols/bgp/node.tag/address-family/node.def
deleted file mode 100644
index 36628c3f..00000000
--- a/templates/protocols/bgp/node.tag/address-family/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: BGP address-family parameters
diff --git a/templates/protocols/bgp/node.tag/maximum-paths/ebgp/node.def b/templates/protocols/bgp/node.tag/maximum-paths/ebgp/node.def
deleted file mode 100644
index c01ec064..00000000
--- a/templates/protocols/bgp/node.tag/maximum-paths/ebgp/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Maximum ebgp multipaths
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)"
-val_help: u32:1-255; EBGP multipaths
diff --git a/templates/protocols/bgp/node.tag/maximum-paths/ibgp/node.def b/templates/protocols/bgp/node.tag/maximum-paths/ibgp/node.def
deleted file mode 100644
index b437ec0b..00000000
--- a/templates/protocols/bgp/node.tag/maximum-paths/ibgp/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Maximum ibgp multipaths
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)"
-val_help: u32:1-255; IBGP multipaths
diff --git a/templates/protocols/bgp/node.tag/maximum-paths/node.def b/templates/protocols/bgp/node.tag/maximum-paths/node.def
deleted file mode 100644
index 17c33530..00000000
--- a/templates/protocols/bgp/node.tag/maximum-paths/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: BGP multipaths
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.def b/templates/protocols/bgp/node.tag/neighbor/node.def
deleted file mode 100644
index ac51c00b..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-tag:
-type: txt
-help: BGP neighbor
-val_help: ipv4; BGP neighbor IP address
-val_help: ipv6; BGP neighbor IPv6 address
-val_help: <interface>; Interface name
-
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl \
- --check-neighbor-ip --neighbor $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/allowas-in/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/allowas-in/node.def
deleted file mode 100644
index 327872ac..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/allowas-in/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Accept a IPv4-route that contains the local-AS in the as-path
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/allowas-in/number/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/allowas-in/number/node.def
deleted file mode 100644
index db60c0a3..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/allowas-in/number/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Number of occurrences of AS number (IPv4)
-val_help: u32:1-10; Number of times AS is allowed in path
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10; "allowas-in number must be between 1 and 10"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/as-override/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/as-override/node.def
deleted file mode 100644
index 7f67513e..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/as-override/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: AS for routes sent to this neighbor to be the local AS
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/as-path/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/as-path/node.def
deleted file mode 100644
index a3a9c592..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/as-path/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send AS path unchanged (IPv4)
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/med/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/med/node.def
deleted file mode 100644
index b64026bb..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/med/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send multi-exit discriminator unchanged (IPv4)
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/next-hop/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/next-hop/node.def
deleted file mode 100644
index 23ec4621..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/next-hop/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send nexthop unchanged (IPv4)
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/node.def
deleted file mode 100644
index 25055d48..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/attribute-unchanged/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: BGP attributes are sent unchanged (IPv4)
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/node.def
deleted file mode 100644
index 0a1fc867..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise capabilities to this neighbor (IPv4)
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/node.def
deleted file mode 100644
index b4b10172..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise ORF capability to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/node.def
deleted file mode 100644
index 257b2bc1..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise prefix-list ORF capability to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/receive/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/receive/node.def
deleted file mode 100644
index c79637f0..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/receive/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Capability to receive the ORF
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/send/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/send/node.def
deleted file mode 100644
index bebf8e36..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/send/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Capability to send the ORF
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/default-originate/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/default-originate/node.def
deleted file mode 100644
index adcb3f5e..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/default-originate/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send default IPv4-route to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/default-originate/route-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/default-originate/route-map/node.def
deleted file mode 100644
index e035518f..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/default-originate/route-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: IPv4-Route-map to specify criteria of the default
-allowed: local -a params
- params=$(/opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map)
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" " ; "route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/export/node.def
deleted file mode 100644
index c7414d02..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/export/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Access-list to filter outgoing IPv4-route updates to this neighbor
-val_help: u32:1-65535; Access list number
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Access list must be between 1 and 65535"
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" "; "access-list $VAR(@) doesn't exist"
-commit:expression: $VAR(../../prefix-list/export/) == ""; "you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/import/node.def
deleted file mode 100644
index 00c6fa38..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/import/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Access-list to filter incoming IPv4-route updates from this neighbor
-val_help: u32:1-65535; Access-list number
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Access list must be between 1 and 65535"
-
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" "; "access-list $VAR(@) doesn't exist"
-commit:expression: $VAR(../../prefix-list/import/) == ""; "you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/node.def
deleted file mode 100644
index 4c25b408..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/distribute-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Access-list to filter IPv4-route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/export/node.def
deleted file mode 100644
index 8c0824ec..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/export/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: As-path-list to filter outgoing IPv4-route updates to this neighbor
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" ";"as-path-list $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/import/node.def
deleted file mode 100644
index 5643a595..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/import/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: As-path-list to filter incoming IPv4-route updates from this neighbor
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" ";"as-path-list $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/node.def
deleted file mode 100644
index f9ab180f..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/filter-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: As-path-list to filter IPv4-route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/maximum-prefix/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/maximum-prefix/node.def
deleted file mode 100644
index 1848bb25..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/maximum-prefix/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Maximum number of IPv4-prefixes to accept from this neighbor
-val_help: u32:1-4294967295; Prefix limit
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967295; "maximum-prefix must be between 1 and 4294967295"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/nexthop-self/force/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/nexthop-self/force/node.def
deleted file mode 100644
index e78bd2e5..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/nexthop-self/force/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set the next hop to self for reflected routes
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/nexthop-self/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/nexthop-self/node.def
deleted file mode 100644
index 175b9772..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/nexthop-self/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Nexthop for IPv4-routes sent to this neighbor to be the local router
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/node.def
deleted file mode 100644
index bc778aa9..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: IPv4 BGP neighbor parameters
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/export/node.def
deleted file mode 100644
index e5b0283b..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/export/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: IPv4-Prefix-list to filter outgoing route updates to this neighbor
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" "; "prefix-list $VAR(@) doesn't exist"
-commit:expression: $VAR(../../distribute-list/export/) == ""; "you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/import/node.def
deleted file mode 100644
index 111f0f8a..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/import/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: IPv4-Prefix-list to filter incoming route updates from this neighbor
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" "; "prefix-list $VAR(@) doesn't exist"
-commit:expression: $VAR(../../distribute-list/import/) == ""; "you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/node.def
deleted file mode 100644
index 7d277fee..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/prefix-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: IPv4-Prefix-list to filter route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/remove-private-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/remove-private-as/node.def
deleted file mode 100644
index b378b2f4..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/remove-private-as/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Remove private AS numbers from AS path in outbound IPv4-route updates
-commit:expression: exec "test $VAR(../../../remote-as/@) -ne $VAR(../../../../@)"; "you can't set remove-private-as for an iBGP peer"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/export/node.def
deleted file mode 100644
index aa5aeac7..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/export/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: IPv4-Route-map to filter outgoing route updates to this neighbor
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" "; "route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/import/node.def
deleted file mode 100644
index ffb37b56..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/import/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: IPv4-Route-map to filter incoming route updates from this neighbor
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" "; "route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/node.def
deleted file mode 100644
index cfba75c3..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-map/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Route-map to filter IPv4-route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-reflector-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-reflector-client/node.def
deleted file mode 100644
index 84f13a6a..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-reflector-client/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-help: Neighbor as a IPv4-route reflector client
-commit:expression: exec "if [ $VAR(../../../../@) != $VAR(../../../remote-as/@) ] && \
- [ $VAR(../../../remote-as/@) != \"internal\" ] && \
- [ $VAR(../../../remote-as/@) != \"external\" ]; \
- then echo \"remote-as must equal local-as\"; exit 1; fi; "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-server-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-server-client/node.def
deleted file mode 100644
index ceb76c5f..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/route-server-client/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Neighbor is IPv4-route server client
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/soft-reconfiguration/inbound/node.def
deleted file mode 100644
index f7310f26..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/soft-reconfiguration/inbound/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Inbound soft reconfiguration for this neighbor [REQUIRED]
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/soft-reconfiguration/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/soft-reconfiguration/node.def
deleted file mode 100644
index d097ab10..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/soft-reconfiguration/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Soft reconfiguration for neighbor (IPv4)
-commit:expression: $VAR(./inbound/) != ""; "you must specify the type of soft-reconfiguration"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/unsuppress-map/node.def
deleted file mode 100644
index a8dc3148..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/unsuppress-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route-map to selectively unsuppress suppressed IPv4-routes
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/weight/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/weight/node.def
deleted file mode 100644
index ec3595f5..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/weight/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Default weight for routes from this neighbor
-val_help: u32: 1-65535; Weight for routes from this neighbor
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "weight must be between 1 and 65535"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/allowas-in/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/allowas-in/node.def
deleted file mode 100644
index e0699608..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/allowas-in/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Accept a route that contains the local-AS in the as-path
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/allowas-in/number/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/allowas-in/number/node.def
deleted file mode 100644
index 857b7b98..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/allowas-in/number/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Number of occurrences of AS number
-val_help: u32:1-10; Number of times AS is allowed in path
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10; "allowas-in number must be between 1 and 10"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/as-path/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/as-path/node.def
deleted file mode 100644
index b2a2a898..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/as-path/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send AS path unchanged
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/med/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/med/node.def
deleted file mode 100644
index c70212cb..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/med/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send multi-exit discriminator unchanged
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/next-hop/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/next-hop/node.def
deleted file mode 100644
index a67c9fec..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/next-hop/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send nexthop unchanged
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/node.def
deleted file mode 100644
index f637407e..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send BGP attributes unchanged
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/dynamic/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/dynamic/node.def
deleted file mode 100644
index bcf94c95..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/dynamic/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise dynamic capability to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/node.def
deleted file mode 100644
index 1a9583b2..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise capabilities to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/node.def
deleted file mode 100644
index b4b10172..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise ORF capability to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/node.def
deleted file mode 100644
index 257b2bc1..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise prefix-list ORF capability to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/receive/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/receive/node.def
deleted file mode 100644
index c79637f0..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/receive/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Capability to receive the ORF
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/send/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/send/node.def
deleted file mode 100644
index bebf8e36..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/send/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Capability to send the ORF
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/node.def
deleted file mode 100644
index bdbdbd66..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send default route to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def
deleted file mode 100644
index 689451ce..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route-map to specify criteria of the default
-allowed: local -a params
- params=$(/opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map)
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" " ; "route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/extended/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/extended/node.def
deleted file mode 100644
index 84fc317b..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/extended/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Disable sending extended community attributes to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/node.def
deleted file mode 100644
index 2fd803db..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Disable sending community attributes to this neighbor
-commit:expression: ($VAR(./extended/) != "") || ($VAR(./standard/) != ""); "you must specify the type of community"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/standard/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/standard/node.def
deleted file mode 100644
index 9734ae9b..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/standard/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Disable sending standard community attributes to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def
deleted file mode 100644
index 135bd0ce..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Access-list to filter outgoing route updates to this neighbor
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list6 )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list6 $VAR(@)\" "; "access-list6 $VAR(@) doesn't exist"
-commit:expression: $VAR(../../prefix-list/export/) == ""; "you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def
deleted file mode 100644
index 473c15be..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Access-list to filter incoming route updates from this neighbor
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list6 )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list6 $VAR(@)\" "; "access-list6 $VAR(@) doesn't exist"
-commit:expression: $VAR(../../prefix-list/import/) == ""; "you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/node.def
deleted file mode 100644
index 28cf509a..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Access-list to filter route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/export/node.def
deleted file mode 100644
index 30c0335e..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/export/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: As-path-list to filter outgoing route updates to this neighbor
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" ";"as-path-list $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/import/node.def
deleted file mode 100644
index 26d8f791..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/import/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: As-path-list to filter incoming route updates from this neighbor
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" " ; "as-path-list $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/node.def
deleted file mode 100644
index 28294cb2..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: As-path-list to filter route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/maximum-prefix/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/maximum-prefix/node.def
deleted file mode 100644
index 781a8752..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/maximum-prefix/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Maximum number of prefixes to accept from this neighbor
-val_help: u32:1-4294967295; Prefix limit
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967295; "maximum-prefix must be between 1 and 4294967295"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-local/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-local/node.def
deleted file mode 100644
index 423a4ee5..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-local/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Nexthop attributes
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-local/unchanged/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-local/unchanged/node.def
deleted file mode 100644
index 01f4361a..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-local/unchanged/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Leave link-local nexthop unchanged for this peer
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-self/force/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-self/force/node.def
deleted file mode 100644
index e78bd2e5..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-self/force/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set the next hop to self for reflected routes
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-self/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-self/node.def
deleted file mode 100644
index 7b00a8f8..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-self/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Nexthop for routes sent to this neighbor to be the local router
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/node.def
deleted file mode 100644
index b905cacf..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: IPv6 BGP neighbor parameters
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/peer-group/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/peer-group/node.def
deleted file mode 100644
index 82806881..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/peer-group/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: IPv6 peer group for this peer
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-bgp.pl --list-peer-groups --as $VAR(../../../../@))
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"protocols bgp $VAR(../../../../@) peer-group $VAR(@)\" "; "protocols bgp $VAR(../../../../@) peer-group $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def
deleted file mode 100644
index fb44bcf7..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: txt
-help: Prefix-list to filter outgoing route updates to this neighbor
-
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list6 )
- echo -n ${params[@]##*/}
-
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list6 $VAR(@)\" "; "prefix-list6 $VAR(@) doesn't exist"
-commit:expression: $VAR(../../distribute-list/export/) == ""; "you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def
deleted file mode 100644
index aeef5566..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: txt
-help: Prefix-list to filter incoming route updates from this neighbor
-
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list6 )
- echo -n ${params[@]##*/}
-
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list6 $VAR(@)\" "; "prefix-list6 $VAR(@) doesn't exist"
-commit:expression: $VAR(../../distribute-list/import/) == ""; "you can't set both a prefix-list and a distribute list"
-
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/node.def
deleted file mode 100644
index 9ea11cad..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Prefix-list to filter route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/remove-private-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/remove-private-as/node.def
deleted file mode 100644
index 9b73cfdf..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/remove-private-as/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Remove private AS numbers from AS path in outbound route updates
-commit:expression: exec "test $VAR(../../../remote-as/@) -ne $VAR(../../../../@)"; "you can't set remove-private-as for an iBGP peer"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/export/node.def
deleted file mode 100644
index 03cb0fe3..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/export/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route-map to filter outgoing route updates to this neighbor
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/import/node.def
deleted file mode 100644
index 7924a4c4..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/import/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route-map to filter incoming route updates from this neighbor
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/node.def
deleted file mode 100644
index d1439e74..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Route-map to filter route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-reflector-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-reflector-client/node.def
deleted file mode 100644
index c49ef8b9..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-reflector-client/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-help: Neighbor as a route reflector client
-commit:expression: exec "if [ $VAR(../../../../@) != $VAR(../../../remote-as/@) ] && \
- [ $VAR(../../../remote-as/@) != \"internal\" ] && \
- [ $VAR(../../../remote-as/@) != \"external\" ]; \
- then echo \"protocols bgp $VAR(../../../../@) neighbor $VAR(../../../@) route-reflector-client: remote-as must equal local-as\"; exit 1; fi; "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-server-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-server-client/node.def
deleted file mode 100644
index ae6b3a0f..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-server-client/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Neighbor as route server client
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def
deleted file mode 100644
index f7310f26..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Inbound soft reconfiguration for this neighbor [REQUIRED]
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/node.def
deleted file mode 100644
index 6e31f108..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Soft reconfiguration for neighbor
-commit:expression: $VAR(./inbound/) != ""; "you must specify the type of soft-reconfiguration"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def
deleted file mode 100644
index 0f1602b2..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route-map to selectively unsuppress suppressed routes
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.def
deleted file mode 100644
index d69173e1..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Parameters relating to IPv4 or IPv6 routes
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def
deleted file mode 100644
index 208d54d9..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Minimum interval for sending routing updates
-val_help: u32:0-600; Advertisement interval in seconds
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600; "must be between 0 and 600"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/bfd/check-control-plane-failure/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/bfd/check-control-plane-failure/node.def
deleted file mode 100644
index fd4e1eef..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/bfd/check-control-plane-failure/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Allow to write CBIT independence in BFD outgoing packets
- and read both C-BIT value of BFD and lookup BGP peer status
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/bfd/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/bfd/node.def
deleted file mode 100644
index 704ccb01..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/bfd/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Enable Bidirectional Forwarding Detection (BFD) support
-commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-bfd-peer $VAR(../@)"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def
deleted file mode 100644
index bcf94c95..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise dynamic capability to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/extended-nexthop/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/extended-nexthop/node.def
deleted file mode 100644
index dcc3cef6..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/extended-nexthop/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise extended-nexthop capability to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def
deleted file mode 100644
index 1a9583b2..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise capabilities to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/description/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/description/node.def
deleted file mode 100644
index 14c1b0b7..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/description/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Description for this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def
deleted file mode 100644
index eda82d36..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Disable capability negotiation with this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def
deleted file mode 100644
index 5f4fe431..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Disable check to see if EBGP peer's address is a connected route
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def
deleted file mode 100644
index 5a33b6c1..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Disable sending extended community attributes to this neighbor (IPv4)
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/node.def
deleted file mode 100644
index 0d915212..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Disable sending community attributes to this neighbor (IPv4)
-commit:expression: ($VAR(./extended/) != "") || ($VAR(./standard/) != ""); "you must specify the type of community"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def
deleted file mode 100644
index a762aac5..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Disable sending standard community attributes to this neighbor (IPv4)
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def
deleted file mode 100644
index a3da4d5d..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: u32
-help: Allow this EBGP neighbor to not be on a directly connected network
-val_help: u32:1-255; Number of hops
-
-syntax:expression: $VAR(@) >=1 && $VAR(@) <= 255; "ebgp-multihop must be between 1 and 255"
-commit:expression: $VAR(../ttl-security/hops/) == ""; "you can't set both ebgp-multihop and ttl-security hops"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/node.def
deleted file mode 100644
index 41ecd0d7..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: interface parameters
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/peer-group/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/peer-group/node.def
deleted file mode 100644
index cbad3a03..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/peer-group/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: peer group for this peer
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-bgp.pl --list-peer-groups --as $VAR(../../../@) )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"protocols bgp $VAR(../../../@) peer-group $VAR(@)\" "; "protocols bgp $VAR(../../../@) peer-group $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/remote-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/remote-as/node.def
deleted file mode 100644
index 80edfd4d..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/remote-as/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Neighbor BGP AS number [REQUIRED]
-allowed: echo "internal external"
-val_help: u32:1-4294967294; Neighbor AS number
-val_help: external; any AS different from the local AS
-val_help: internal; same as the local AS
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-remote-as $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/node.def
deleted file mode 100644
index 0c454278..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Enable BGP with v6 link-local only
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/peer-group/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/peer-group/node.def
deleted file mode 100644
index 5a5257e2..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/peer-group/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: peer group for this peer
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-bgp.pl --list-peer-groups --as $VAR(../../../../@) )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"protocols bgp $VAR(../../../../@) peer-group $VAR(@)\" "; "protocols bgp $VAR(../../../../@) peer-group $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/remote-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/remote-as/node.def
deleted file mode 100644
index 80edfd4d..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/remote-as/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Neighbor BGP AS number [REQUIRED]
-allowed: echo "internal external"
-val_help: u32:1-4294967294; Neighbor AS number
-val_help: external; any AS different from the local AS
-val_help: internal; same as the local AS
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-remote-as $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def
deleted file mode 100644
index d81f497f..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-tag:1
-type: u32
-help: Local AS number
-val_help: u32:1-4294967294; Local AS number
-syntax:expression: $VAR(@) >=1 && $VAR(@) <= 4294967294; "local-as must be between 1 and 4294967294"
-commit:expression: $VAR(@) != $VAR(../../@); "you can't set local-as the same as the router AS"
-commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --is-iBGP --neighbor $VAR(../@) --as $VAR(../../@)"; "local-as can't be set on iBGP peers"
-
-end: if [ "$COMMIT_ACTION" != DELETE ]; then
- ### check below didn't work via commit:expression:
- if [ $VAR(@) -eq $VAR(../@/remote-as/@) ];
- then echo "local-as: "$VAR(@)" and remote-as: "$VAR(../@/remote-as/@)" can't be the same"
- exit 1
- fi
- fi
-
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.tag/no-prepend/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.tag/no-prepend/node.def
deleted file mode 100644
index 5270b67f..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.tag/no-prepend/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Do not prepend local-as to updates from EBGP peers
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.tag/no-prepend/replace-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.tag/no-prepend/replace-as/node.def
deleted file mode 100644
index 52fbc0b0..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.tag/no-prepend/replace-as/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Only prepend local-as when transmitting local-route updates to this peer.
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def
deleted file mode 100644
index 4cafcb8b..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Ignore capability negotiation with specified neighbor
-commit:expression: $VAR(../strict-capability/) == ""; "you can't set both strict-capability and override-capability"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def
deleted file mode 100644
index bdd812bb..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Do not initiate a session with this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def
deleted file mode 100644
index 2290b2ea..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: BGP MD5 password
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 80 ]; then \
- echo Password must be 80 characters or less;\
- exit 1 ; \
- fi ; "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def
deleted file mode 100644
index b707f391..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: IPv4 peer group for this peer
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-bgp.pl --list-peer-groups --as $VAR(../../@) )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"protocols bgp $VAR(../../@) peer-group $VAR(@)\" "; "protocols bgp $VAR(../../@) peer-group $VAR(@) doesn't exist"
-commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-peer-group-bfd $VAR(@) --as $VAR(../../@)"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def
deleted file mode 100644
index 1e463a30..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: Neighbor's BGP port
-val_help: u32: 1-65535; Neighbor BGP port number
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; \
- "port must be between 1 and 65535"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
deleted file mode 100644
index 79939380..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Neighbor BGP AS number [REQUIRED]
-allowed: echo "internal external"
-val_help: u32:1-4294967294; AS number
-val_help: external; any AS different from the local AS
-val_help: internal; same as local AS
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-remote-as $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def
deleted file mode 100644
index e842f340..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Administratively shut down neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def
deleted file mode 100644
index b50b823a..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Enable strict capability negotiation
-commit:expression: $VAR(../override-capability/) == ""; "you can't set both strict-capability and override-capability"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/connect/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/connect/node.def
deleted file mode 100644
index c0ae078a..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/connect/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: BGP connect timer for this neighbor
-val_help: u32:1-65535; Connect timer in seconds
-val_help: 0; Disable connect timer
-syntax:expression: $VAR(@) >=0 && $VAR(@) <= 65535; "BGP connect timer must be between 0 and 65535"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/holdtime/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/holdtime/node.def
deleted file mode 100644
index ad02bfc8..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/holdtime/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: u32
-default: 180
-help: BGP hold timer for this neighbor
-val_help: u32:1-65535; Hold timer in seconds
-val_help: 0; Disable hold timer
-syntax:expression: $VAR(@) == 0 || ($VAR(@) >= 4 && $VAR(@) <= 65535); "Holdtime interval must be 0 or between 4 and 65535"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/keepalive/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/keepalive/node.def
deleted file mode 100644
index 671bd52a..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/keepalive/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-default: 60
-help: BGP keepalive interval for this neighbor
-val_help: u32:1-65535; Keepalive interval in seconds (default 60)
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Keepalive interval must be between 1 and 65535"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def
deleted file mode 100644
index 7a5633a5..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-help: Neighbor timers
-# TODO: fix this. Can set connect &&|| (keepalive && holdtime)
-commit:expression: $VAR(./keepalive/) != ""; "you must set a keepalive interval"
-commit:expression: $VAR(./holdtime/) != ""; "you must set a holdtime interval"
-
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/hops/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/hops/node.def
deleted file mode 100644
index 6014ad82..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/hops/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: u32
-help: Number of the maximum number of hops to the BGP peer
-val_help: u32:1-254; Number of hops
-
-syntax:expression: $VAR(@) >=1 && $VAR(@) <= 254; "ttl-security hops must be between 1 and 254"
-commit:expression: $VAR(../../ebgp-multihop/) == ""; "you can't set both ebgp-multihop and ttl-security hops"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def
deleted file mode 100644
index cc142c95..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Ttl security mechanism for this BGP peer
-
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def
deleted file mode 100644
index cd555b5f..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: Source IP of routing updates
-val_help: ipv4; IP address of route source
-val_help: <interface>; Interface as route source
-commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-source $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def b/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def
deleted file mode 100644
index 7c9df567..00000000
--- a/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Always compare MEDs from different neighbors
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def
deleted file mode 100644
index f87e0cdb..00000000
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Compare AS-path lengths including confederation sets & sequences
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def
deleted file mode 100644
index 5ee32fbb..00000000
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Ignore AS-path length in selecting a route
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/multipath-relax/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/multipath-relax/node.def
deleted file mode 100644
index 08570159..00000000
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/multipath-relax/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: specifies that BGP decision process should consider paths of equal AS_PATH length candidates for multipath computation
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/node.def
deleted file mode 100644
index eeb9234c..00000000
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: AS-path attribute comparison parameters
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def
deleted file mode 100644
index 884fcecf..00000000
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Compare the router-id for identical EBGP paths
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def
deleted file mode 100644
index 7ea833f6..00000000
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Compare MEDs among confederation paths
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def
deleted file mode 100644
index 8b72d682..00000000
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Treat missing route as a MED as the least preferred one
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/med/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/med/node.def
deleted file mode 100644
index 44f97159..00000000
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/med/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: MED attribute comparison parameters
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/node.def
deleted file mode 100644
index 3356898c..00000000
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Default bestpath selection mechanism
diff --git a/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def b/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def
deleted file mode 100644
index 72e09e04..00000000
--- a/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4
-help: Route-reflector cluster-id
diff --git a/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def b/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def
deleted file mode 100644
index c30ff542..00000000
--- a/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Confederation AS identifier [REQUIRED]
-val_help: u32:1-4294967294; Confederation AS id
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "confederation AS id must be between 1 and 4294967294"
diff --git a/templates/protocols/bgp/node.tag/parameters/confederation/node.def b/templates/protocols/bgp/node.tag/parameters/confederation/node.def
deleted file mode 100644
index 4933aeab..00000000
--- a/templates/protocols/bgp/node.tag/parameters/confederation/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: AS confederation parameters
diff --git a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
deleted file mode 100644
index 7e165489..00000000
--- a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-multi:
-type: u32
-help: Peer ASs in the BGP confederation
-val_help: u32:1-4294967294; Peer AS number
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "confederation AS id must be between 1 and 4294967294"
-commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --confed-iBGP-ASN-check $VAR(@) --as $VAR(../../../@)"; "Can't set confederation peers ASN to $VAR(@). Delete any neighbors with remote-as $VAR(@) and/or change the local ASN first."
diff --git a/templates/protocols/bgp/node.tag/parameters/dampening/half-life/node.def b/templates/protocols/bgp/node.tag/parameters/dampening/half-life/node.def
deleted file mode 100644
index 9e30940c..00000000
--- a/templates/protocols/bgp/node.tag/parameters/dampening/half-life/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Half-life time for dampening [REQUIRED]
-val_help: u32:1-45; Half-life penalty in seconds
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 45; "Half-life penalty must be between 1 and 45"
diff --git a/templates/protocols/bgp/node.tag/parameters/dampening/max-suppress-time/node.def b/templates/protocols/bgp/node.tag/parameters/dampening/max-suppress-time/node.def
deleted file mode 100644
index 44e693f6..00000000
--- a/templates/protocols/bgp/node.tag/parameters/dampening/max-suppress-time/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: u32
-help: Maximum duration to suppress a stable route [REQUIRED]
-val_help: u32:1-255; Maximum suppress duration in seconds
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Max-suppress-time must be between 1 and 255"
-commit:expression: $VAR(../re-use/) != ""; "you must set a re-use time"
-commit:expression: $VAR(../start-suppress-time/) != ""; "you must set a start-suppress-time"
diff --git a/templates/protocols/bgp/node.tag/parameters/dampening/node.def b/templates/protocols/bgp/node.tag/parameters/dampening/node.def
deleted file mode 100644
index 5d2655a4..00000000
--- a/templates/protocols/bgp/node.tag/parameters/dampening/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: Enable route-flap dampening
-# Note that there is a bug in quagga here. If bgpd gets two 'no bgp dampening'
-# commands in a row it will crash
-
-commit:expression: $VAR(./half-life/) != "" || $VAR(./max-suppress-time/) != "" || \
- $VAR(./re-use/) != "" || $VAR(./start-suppress-time/) != "" ; \
- "To define dampening, all parameters must be set"
diff --git a/templates/protocols/bgp/node.tag/parameters/dampening/re-use/node.def b/templates/protocols/bgp/node.tag/parameters/dampening/re-use/node.def
deleted file mode 100644
index b4a12622..00000000
--- a/templates/protocols/bgp/node.tag/parameters/dampening/re-use/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: u32
-help: Time to start reusing a route [REQUIRED]
-val_help: u32:1-20000; Re-use time in seconds
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 20000; "Re-use value must be between 1 and 20000"
-commit:expression: $VAR(../start-suppress-time/) != ""; "you must set start-suppress-time"
-commit:expression: $VAR(../max-suppress-time/) != ""; "you must set max-suppress-time"
diff --git a/templates/protocols/bgp/node.tag/parameters/dampening/start-suppress-time/node.def b/templates/protocols/bgp/node.tag/parameters/dampening/start-suppress-time/node.def
deleted file mode 100644
index c7ee5b0e..00000000
--- a/templates/protocols/bgp/node.tag/parameters/dampening/start-suppress-time/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: u32
-help: When to start suppressing a route [REQUIRED]
-val_help: u32:1-20000; Start-suppress-time
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 20000; "Start-suppress-time must be between 1 and 20000"
-commit:expression: $VAR(../re-use/) != ""; "you must set re-use"
-commit:expression: $VAR(../max-suppress-time/) != ""; "you must set max-suppress-time"
diff --git a/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def b/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def
deleted file mode 100644
index 05b2ddfc..00000000
--- a/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: u32
-help: Default local preference (higher=more preferred)
-val_help: u32:0-4294967295; Local preference
diff --git a/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def b/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def
deleted file mode 100644
index 3c3e6566..00000000
--- a/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Deactivate IPv4 unicast for a peer by default
diff --git a/templates/protocols/bgp/node.tag/parameters/default/node.def b/templates/protocols/bgp/node.tag/parameters/default/node.def
deleted file mode 100644
index 1b569e9d..00000000
--- a/templates/protocols/bgp/node.tag/parameters/default/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: BGP defaults
diff --git a/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def b/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def
deleted file mode 100644
index a285fe43..00000000
--- a/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Compare MEDs between different peers in the same AS
diff --git a/templates/protocols/bgp/node.tag/parameters/distance/global/external/node.def b/templates/protocols/bgp/node.tag/parameters/distance/global/external/node.def
deleted file mode 100644
index db22f7e8..00000000
--- a/templates/protocols/bgp/node.tag/parameters/distance/global/external/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Administrative distance for external BGP routes
-val_help: u32:1-255; Administrative distance for external BGP routes
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255"
diff --git a/templates/protocols/bgp/node.tag/parameters/distance/global/internal/node.def b/templates/protocols/bgp/node.tag/parameters/distance/global/internal/node.def
deleted file mode 100644
index 9689e103..00000000
--- a/templates/protocols/bgp/node.tag/parameters/distance/global/internal/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Administrative distance for internal BGP routes
-val_help: u32:1-255; Administrative distance for internal BGP routes
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255"
diff --git a/templates/protocols/bgp/node.tag/parameters/distance/global/local/node.def b/templates/protocols/bgp/node.tag/parameters/distance/global/local/node.def
deleted file mode 100644
index bc573238..00000000
--- a/templates/protocols/bgp/node.tag/parameters/distance/global/local/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Administrative distance for local BGP routes
-val_help: u32:1-255; Administrative distance for local BGP routes
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255"
diff --git a/templates/protocols/bgp/node.tag/parameters/distance/global/node.def b/templates/protocols/bgp/node.tag/parameters/distance/global/node.def
deleted file mode 100644
index de4720f2..00000000
--- a/templates/protocols/bgp/node.tag/parameters/distance/global/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Global administratives distances for BGP routes
-commit:expression: $VAR(./external/) != ""; "you must set an external route distance"
-commit:expression: $VAR(./internal/) != ""; "you must set an internal route distance"
-commit:expression: $VAR(./local/) != ""; "you must set a local route distance"
diff --git a/templates/protocols/bgp/node.tag/parameters/distance/node.def b/templates/protocols/bgp/node.tag/parameters/distance/node.def
deleted file mode 100644
index 72954529..00000000
--- a/templates/protocols/bgp/node.tag/parameters/distance/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Administratives distances for BGP routes
diff --git a/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.def b/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.def
deleted file mode 100644
index 10ffb85e..00000000
--- a/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-tag:
-type: ipv4net
-help: Administrative distance for a specific BGP prefix
-syntax:expression: exec "ipaddrcheck --verbose --is-any-net $VAR(@)"
-commit:expression: $VAR(./distance/) != ""; "you must set a route distance for this prefix"
diff --git a/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.tag/distance/node.def b/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.tag/distance/node.def
deleted file mode 100644
index 786cea36..00000000
--- a/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.tag/distance/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Administrative distance for prefix
-val_help: u32:1-255; Administrative distance for external BGP routes
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255"
diff --git a/templates/protocols/bgp/node.tag/parameters/graceful-restart/node.def b/templates/protocols/bgp/node.tag/parameters/graceful-restart/node.def
deleted file mode 100644
index ef9d8f38..00000000
--- a/templates/protocols/bgp/node.tag/parameters/graceful-restart/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Graceful restart capability parameters
diff --git a/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def b/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def
deleted file mode 100644
index 678deece..00000000
--- a/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Maximum time to hold onto restarting peer's stale paths
-val_help: u32:1-3600; Hold time in seconds
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 3600; "stalepath-time must be between 1 and 3600"
diff --git a/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def b/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def
deleted file mode 100644
index 528361ab..00000000
--- a/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Log neighbor up/down changes and reset reason
diff --git a/templates/protocols/bgp/node.tag/parameters/network-import-check/node.def b/templates/protocols/bgp/node.tag/parameters/network-import-check/node.def
deleted file mode 100644
index 29e5e916..00000000
--- a/templates/protocols/bgp/node.tag/parameters/network-import-check/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Enable IGP route check for network statements
diff --git a/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def b/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def
deleted file mode 100644
index 37cf3d94..00000000
--- a/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Disable client to client route reflection
diff --git a/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def b/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def
deleted file mode 100644
index 0302357a..00000000
--- a/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Disable immediate sesison reset if peer's connected link goes down
diff --git a/templates/protocols/bgp/node.tag/parameters/node.def b/templates/protocols/bgp/node.tag/parameters/node.def
deleted file mode 100644
index ac7c5a48..00000000
--- a/templates/protocols/bgp/node.tag/parameters/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: BGP parameters
diff --git a/templates/protocols/bgp/node.tag/parameters/router-id/node.def b/templates/protocols/bgp/node.tag/parameters/router-id/node.def
deleted file mode 100644
index 788aac57..00000000
--- a/templates/protocols/bgp/node.tag/parameters/router-id/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4
-help: BGP router id
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.def b/templates/protocols/bgp/node.tag/peer-group/node.def
deleted file mode 100644
index 47f4c2df..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-tag:
-type: txt
-help: BGP peer-group
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl \
- --check-peergroup-name $VAR(@)"
-delete:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl \
- --check-peer-groups --peergroup $VAR(@) --as $VAR(../@)"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/allowas-in/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/allowas-in/node.def
deleted file mode 100644
index e0699608..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/allowas-in/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Accept a route that contains the local-AS in the as-path
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/allowas-in/number/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/allowas-in/number/node.def
deleted file mode 100644
index 857b7b98..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/allowas-in/number/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Number of occurrences of AS number
-val_help: u32:1-10; Number of times AS is allowed in path
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10; "allowas-in number must be between 1 and 10"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/as-path/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/as-path/node.def
deleted file mode 100644
index b2a2a898..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/as-path/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send AS path unchanged
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/med/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/med/node.def
deleted file mode 100644
index c70212cb..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/med/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send multi-exit discriminator unchanged
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/next-hop/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/next-hop/node.def
deleted file mode 100644
index a67c9fec..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/next-hop/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send nexthop unchanged
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/node.def
deleted file mode 100644
index d1135a3a..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/attribute-unchanged/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: BGP attributes are sent unchanged
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/dynamic/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/dynamic/node.def
deleted file mode 100644
index c8f64a26..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/dynamic/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise dynamic capability to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/node.def
deleted file mode 100644
index 715932f2..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise capabilities to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/node.def
deleted file mode 100644
index 7ddab63b..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise ORF capability to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/node.def
deleted file mode 100644
index e57cf555..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise prefix-list ORF capability to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/receive/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/receive/node.def
deleted file mode 100644
index c79637f0..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/receive/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Capability to receive the ORF
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/send/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/send/node.def
deleted file mode 100644
index bebf8e36..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/capability/orf/prefix-list/send/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Capability to send the ORF
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/default-originate/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/default-originate/node.def
deleted file mode 100644
index bb7e2958..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/default-originate/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send default route to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/default-originate/route-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/default-originate/route-map/node.def
deleted file mode 100644
index 689451ce..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/default-originate/route-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route-map to specify criteria of the default
-allowed: local -a params
- params=$(/opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map)
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" " ; "route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/extended/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/extended/node.def
deleted file mode 100644
index d9c17f81..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/extended/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Disable sending extended community attributes to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/node.def
deleted file mode 100644
index 2f4c5cbe..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Disable sending community attributes to this peer-group
-commit:expression: ($VAR(./extended/) != "") || ($VAR(./standard/) != ""); "you must specify the type of community"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/standard/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/standard/node.def
deleted file mode 100644
index 1f6d927e..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/disable-send-community/standard/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Disable sending standard community attributes to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/export/node.def
deleted file mode 100644
index 452e9eda..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/export/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Access-list to filter outgoing route updates to this peer-group
-val_help: u32:1-65535; Access list number
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Access list must be between 1 and 65535"
-
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" "; "access-list $VAR(@) doesn't exist"
-commit:expression: $VAR(../../prefix-list/export/) == ""; "you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/import/node.def
deleted file mode 100644
index f19d1d77..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/import/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Access-list to filter incoming route updates from this peer-group
-val_help: u32:1-65535; Access list number
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Access list must be between 1 and 65535"
-
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" "; "access-list $VAR(@) doesn't exist"
-commit:expression: $VAR(../../prefix-list/import/) == ""; "you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/node.def
deleted file mode 100644
index ac125a22..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/distribute-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Access-list to filter route updates to/from this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/export/node.def
deleted file mode 100644
index 4ed52f34..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/export/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: As-path-list to filter outgoing route updates to this peer-group
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" ";"as-path-list $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/import/node.def
deleted file mode 100644
index caeb3e20..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/import/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: As-path-list to filter incoming route updates from this peer-group
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" ";"as-path-list $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/node.def
deleted file mode 100644
index d7c3919b..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/filter-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: As-path-list to filter route updates to/from this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/maximum-prefix/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/maximum-prefix/node.def
deleted file mode 100644
index 6909a6f0..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/maximum-prefix/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Maximum number of prefixes to accept from this peer-group
-val_help: u32:1-4294967295; Prefix limit
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967295; "maximum-prefix must be between 1 and 4294967295"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/nexthop-self/force/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/nexthop-self/force/node.def
deleted file mode 100644
index e78bd2e5..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/nexthop-self/force/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set the next hop to self for reflected routes
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/nexthop-self/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/nexthop-self/node.def
deleted file mode 100644
index 83c9fc96..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/nexthop-self/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Nexthop for routes sent to this peer-group to be the local router
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/node.def
deleted file mode 100644
index a8e6ed20..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: IPv4 BGP peer group parameters
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/export/node.def
deleted file mode 100644
index 303cf43f..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/export/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-help: Prefix-list to filter outgoing route updates to this peer-group
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list )
- echo -n ${params[@]##*/}
-
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" "; "prefix-list $VAR(@) doesn't exist"
-commit:expression: $VAR(../../distribute-list/export/) == ""; "you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/import/node.def
deleted file mode 100644
index ff96c716..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/import/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Prefix-list to filter incoming route updates from this peer-group
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" "; "prefix-list $VAR(@) doesn't exist"
-commit:expression: $VAR(../../distribute-list/import/) == ""; "you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/node.def
deleted file mode 100644
index 65b0a4b8..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/prefix-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Prefix-list to filter route updates to/from this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/remove-private-as/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/remove-private-as/node.def
deleted file mode 100644
index 8d214005..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/remove-private-as/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Remove private AS numbers from AS path in outbound route updates
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/export/node.def
deleted file mode 100644
index c374aa33..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/export/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route-map to filter outgoing route updates to this peer-group
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/import/node.def
deleted file mode 100644
index f1cddef5..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/import/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route-map to filter incoming route updates from this peer-group
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/node.def
deleted file mode 100644
index a9726b21..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-map/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Route-map to filter route updates to/from this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-reflector-client/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-reflector-client/node.def
deleted file mode 100644
index 9c8cfe1d..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-reflector-client/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-help: Peer-group as a route reflector client
-commit:expression: exec "if [ $VAR(../../../../@) != $VAR(../../../remote-as/@) ] && \
- [ $VAR(../../../remote-as/@) != \"internal\" ] && \
- [ $VAR(../../../remote-as/@) != \"external\" ]; \
- then echo \"remote-as must equal local-as\"; exit 1; fi; "
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-server-client/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-server-client/node.def
deleted file mode 100644
index c14e9686..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/route-server-client/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Peer-group as route server client
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/soft-reconfiguration/inbound/node.def
deleted file mode 100644
index 8a5f1880..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/soft-reconfiguration/inbound/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Inbound soft reconfiguration for this peer-group [REQUIRED]
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/soft-reconfiguration/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/soft-reconfiguration/node.def
deleted file mode 100644
index 839477d3..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/soft-reconfiguration/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Soft reconfiguration for peer-group
-commit:expression: $VAR(./inbound/) != ""; "you must specify the type of soft-reconfiguration"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/unsuppress-map/node.def
deleted file mode 100644
index 0f1602b2..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/unsuppress-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route-map to selectively unsuppress suppressed routes
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/weight/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/weight/node.def
deleted file mode 100644
index 45ebcd48..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv4-unicast/weight/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Default weight for routes from this peer-group
-val_help: u32:1-65535; Weight for routes from this peer-group
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "weight must be between 1 and 65535"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/allowas-in/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/allowas-in/node.def
deleted file mode 100644
index e0699608..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/allowas-in/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Accept a route that contains the local-AS in the as-path
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/allowas-in/number/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/allowas-in/number/node.def
deleted file mode 100644
index 857b7b98..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/allowas-in/number/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Number of occurrences of AS number
-val_help: u32:1-10; Number of times AS is allowed in path
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10; "allowas-in number must be between 1 and 10"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/as-path/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/as-path/node.def
deleted file mode 100644
index b2a2a898..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/as-path/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send AS path unchanged
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/med/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/med/node.def
deleted file mode 100644
index c70212cb..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/med/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send multi-exit discriminator unchanged
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/next-hop/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/next-hop/node.def
deleted file mode 100644
index a67c9fec..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/next-hop/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send nexthop unchanged
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/node.def
deleted file mode 100644
index f637407e..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send BGP attributes unchanged
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/dynamic/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/dynamic/node.def
deleted file mode 100644
index c8f64a26..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/dynamic/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise dynamic capability to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/node.def
deleted file mode 100644
index 715932f2..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise capabilities to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/node.def
deleted file mode 100644
index 7ddab63b..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise ORF capability to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/node.def
deleted file mode 100644
index e57cf555..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise prefix-list ORF capability to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/receive/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/receive/node.def
deleted file mode 100644
index c79637f0..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/receive/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Capability to receive the ORF
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/send/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/send/node.def
deleted file mode 100644
index bebf8e36..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/send/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Capability to send the ORF
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/node.def
deleted file mode 100644
index bb7e2958..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Send default route to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def
deleted file mode 100644
index 689451ce..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route-map to specify criteria of the default
-allowed: local -a params
- params=$(/opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map)
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" " ; "route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/extended/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/extended/node.def
deleted file mode 100644
index d9c17f81..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/extended/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Disable sending extended community attributes to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/node.def
deleted file mode 100644
index 2f4c5cbe..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Disable sending community attributes to this peer-group
-commit:expression: ($VAR(./extended/) != "") || ($VAR(./standard/) != ""); "you must specify the type of community"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/standard/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/standard/node.def
deleted file mode 100644
index 1f6d927e..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/standard/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Disable sending standard community attributes to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def
deleted file mode 100644
index 83aac419..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Access-list to filter outgoing route updates to this peer-group
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list6 )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list6 $VAR(@)\" "; "access-list6 $VAR(@) doesn't exist"
-commit:expression: $VAR(../../prefix-list/export/) == ""; "you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def
deleted file mode 100644
index 621bd0c2..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Access-list to filter incoming route updates from this peer-group
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list6 )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list6 $VAR(@)\" "; "access-list6 $VAR(@) doesn't exist"
-commit:expression: $VAR(../../prefix-list/import/) == ""; "you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/node.def
deleted file mode 100644
index ac125a22..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Access-list to filter route updates to/from this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/export/node.def
deleted file mode 100644
index 4ed52f34..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/export/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: As-path-list to filter outgoing route updates to this peer-group
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" ";"as-path-list $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/import/node.def
deleted file mode 100644
index caeb3e20..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/import/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: As-path-list to filter incoming route updates from this peer-group
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" ";"as-path-list $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/node.def
deleted file mode 100644
index d7c3919b..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: As-path-list to filter route updates to/from this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/maximum-prefix/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/maximum-prefix/node.def
deleted file mode 100644
index 6909a6f0..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/maximum-prefix/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Maximum number of prefixes to accept from this peer-group
-val_help: u32:1-4294967295; Prefix limit
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967295; "maximum-prefix must be between 1 and 4294967295"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-local/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-local/node.def
deleted file mode 100644
index 423a4ee5..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-local/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Nexthop attributes
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-local/unchanged/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-local/unchanged/node.def
deleted file mode 100644
index 01f4361a..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-local/unchanged/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Leave link-local nexthop unchanged for this peer
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-self/force/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-self/force/node.def
deleted file mode 100644
index e78bd2e5..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-self/force/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set the next hop to self for reflected routes
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-self/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-self/node.def
deleted file mode 100644
index 83c9fc96..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-self/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Nexthop for routes sent to this peer-group to be the local router
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/node.def
deleted file mode 100644
index baa8ca9d..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: IPv6 BGP peer-group parameters
-delete:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl \
- --check-peer-groups-6 --peergroup $VAR(../../@) --as $VAR(../../../@)"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def
deleted file mode 100644
index 9d5843d6..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Prefix-list to filter outgoing route updates to this peer-group
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list6 )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list6 $VAR(@)\" "; "prefix-list6 $VAR(@) doesn't exist"
-commit:expression: $VAR(../../distribute-list/export/) == ""; "you can't set both a prefix-list and a distribute list"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def
deleted file mode 100644
index 08814067..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-help: Prefix-list to filter incoming route updates from this peer-group
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list6 )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list6 $VAR(@)\" "; "prefix-list6 $VAR(@) doesn't exist"
-commit:expression: $VAR(../../distribute-list/import/) == ""; "you can't set both a prefix-list and a distribute list"
-
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/node.def
deleted file mode 100644
index 65b0a4b8..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Prefix-list to filter route updates to/from this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/remove-private-as/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/remove-private-as/node.def
deleted file mode 100644
index 8d214005..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/remove-private-as/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Remove private AS numbers from AS path in outbound route updates
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/export/node.def
deleted file mode 100644
index c374aa33..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/export/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route-map to filter outgoing route updates to this peer-group
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/import/node.def
deleted file mode 100644
index f1cddef5..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/import/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route-map to filter incoming route updates from this peer-group
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/node.def
deleted file mode 100644
index a9726b21..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Route-map to filter route updates to/from this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-reflector-client/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-reflector-client/node.def
deleted file mode 100644
index 9c8cfe1d..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-reflector-client/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-help: Peer-group as a route reflector client
-commit:expression: exec "if [ $VAR(../../../../@) != $VAR(../../../remote-as/@) ] && \
- [ $VAR(../../../remote-as/@) != \"internal\" ] && \
- [ $VAR(../../../remote-as/@) != \"external\" ]; \
- then echo \"remote-as must equal local-as\"; exit 1; fi; "
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-server-client/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-server-client/node.def
deleted file mode 100644
index c14e9686..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-server-client/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Peer-group as route server client
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def
deleted file mode 100644
index 8a5f1880..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Inbound soft reconfiguration for this peer-group [REQUIRED]
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/node.def
deleted file mode 100644
index 839477d3..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Soft reconfiguration for peer-group
-commit:expression: $VAR(./inbound/) != ""; "you must specify the type of soft-reconfiguration"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def
deleted file mode 100644
index 0f1602b2..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Route-map to selectively unsuppress suppressed routes
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/node.def
deleted file mode 100644
index ef1e13c5..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: BGP peer-group address-family parameters
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/bfd/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/bfd/node.def
deleted file mode 100644
index c76e88e4..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/bfd/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Enable Bidirectional Forwarding Detection (BFD) support
-commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-peer-group-bfd $VAR(../@) --as $VAR(../../@)"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/dynamic/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/dynamic/node.def
deleted file mode 100644
index c8f64a26..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/dynamic/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise dynamic capability to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/extended-nexthop/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/extended-nexthop/node.def
deleted file mode 100644
index dcc3cef6..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/extended-nexthop/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise extended-nexthop capability to this neighbor
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/node.def
deleted file mode 100644
index 715932f2..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Advertise capabilities to this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/description/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/description/node.def
deleted file mode 100644
index 21008dee..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/description/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Description for this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-capability-negotiation/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-capability-negotiation/node.def
deleted file mode 100644
index 29987278..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-capability-negotiation/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Disable capability negotiation with this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-connected-check/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-connected-check/node.def
deleted file mode 100644
index 5f4fe431..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-connected-check/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Disable check to see if EBGP peer's address is a connected route
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/ebgp-multihop/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/ebgp-multihop/node.def
deleted file mode 100644
index ae541e15..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/ebgp-multihop/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: u32
-help: Allow this EBGP peer-group to not be on a directly connected network
-val_help: u32:1-255; Number of hops
-
-syntax:expression: $VAR(@) >=1 && $VAR(@) <= 255; "ebgp-multihop must be between 1 and 255"
-commit:expression: $VAR(../ttl-security/hops/) == ""; "you can't set both ebgp-multihop and ttl-security hops"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/local-as/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/local-as/node.def
deleted file mode 100644
index 5cc6b1e7..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/local-as/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-tag:
-type: u32
-help: Local AS number [REQUIRED]
-val_help: u32: 1-4294967294; Local AS number
-syntax:expression: $VAR(@) >=1 && $VAR(@) <= 4294967294; "local-as must be between 1 and 4294967294"
-commit:expression: $VAR(@) != $VAR(../../@); "you can't set local-as the same as the router AS"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/local-as/node.tag/no-prepend/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/local-as/node.tag/no-prepend/node.def
deleted file mode 100644
index c805c4bf..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/local-as/node.tag/no-prepend/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Disable prepending local-as to updates from EBGP peers
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/override-capability/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/override-capability/node.def
deleted file mode 100644
index ebe04148..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/override-capability/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Ignore capability negotiation with specified peer-group
-commit:expression: $VAR(../strict-capability/) == ""; "you can't set both strict-capability and override-capability"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/passive/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/passive/node.def
deleted file mode 100644
index 9d5eefdc..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/passive/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Do not intiate a session with this peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/password/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/password/node.def
deleted file mode 100644
index 5b93648f..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/password/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-help: BGP MD5 password
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 80 ]; then \
- echo Password must be 80 characters or less;\
- exit 1 ; \
- fi ; "
-
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/remote-as/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/remote-as/node.def
deleted file mode 100644
index 80edfd4d..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/remote-as/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Neighbor BGP AS number [REQUIRED]
-allowed: echo "internal external"
-val_help: u32:1-4294967294; Neighbor AS number
-val_help: external; any AS different from the local AS
-val_help: internal; same as the local AS
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-remote-as $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/shutdown/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/shutdown/node.def
deleted file mode 100644
index f50d73a2..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/shutdown/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Administratively shut down peer-group
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/hops/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/hops/node.def
deleted file mode 100644
index 6014ad82..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/hops/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: u32
-help: Number of the maximum number of hops to the BGP peer
-val_help: u32:1-254; Number of hops
-
-syntax:expression: $VAR(@) >=1 && $VAR(@) <= 254; "ttl-security hops must be between 1 and 254"
-commit:expression: $VAR(../../ebgp-multihop/) == ""; "you can't set both ebgp-multihop and ttl-security hops"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def
deleted file mode 100644
index 31c4f4e3..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Ttl security mechanism
-
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/update-source/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/update-source/node.def
deleted file mode 100644
index 60931d4f..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/update-source/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Source IP of routing updates
-val_help: ipv4;IP address of route source
-val_help: <interface>; Interface as route source
-
-commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-source $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/route-map/node.def b/templates/protocols/bgp/node.tag/route-map/node.def
deleted file mode 100644
index 5c56f1e6..00000000
--- a/templates/protocols/bgp/node.tag/route-map/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-help: Filter routes installed in local route map
-allowed: local -a params
- params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
- echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
-create:expression: "vtysh -c \"configure terminal\" -c \"ip protocol bgp route-map $VAR(@)\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"no ip protocol bgp\" "
diff --git a/templates/protocols/bgp/node.tag/timers/holdtime/node.def b/templates/protocols/bgp/node.tag/timers/holdtime/node.def
deleted file mode 100644
index 7573f2aa..00000000
--- a/templates/protocols/bgp/node.tag/timers/holdtime/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: BGP holdtime interval
-val_help: u32:4-65535; Hold-time in seconds (default 180)
-val_help: 0; Don't hold routes
-
-default: 180
-syntax:expression: $VAR(@) == 0 || ($VAR(@) >= 4 && $VAR(@) <= 65535); \
- "hold-time interval must be 0 or between 4 and 65535"
diff --git a/templates/protocols/bgp/node.tag/timers/keepalive/node.def b/templates/protocols/bgp/node.tag/timers/keepalive/node.def
deleted file mode 100644
index 545d905e..00000000
--- a/templates/protocols/bgp/node.tag/timers/keepalive/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: u32
-default: 60
-help: Keepalive interval
-val_help: u32:1-65535; Keep-alive time in seconds (default 60)
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; \
- "Keepalive interval must be between 1 and 65535"
diff --git a/templates/protocols/bgp/node.tag/timers/node.def b/templates/protocols/bgp/node.tag/timers/node.def
deleted file mode 100644
index 9ea1837b..00000000
--- a/templates/protocols/bgp/node.tag/timers/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: BGP protocol timers
-commit:expression: $VAR(./keepalive/) != ""; "you must set a keepalive interval"
-commit:expression: $VAR(./holdtime/) != ""; "you must set a holdtime interval"