Bgp variables cleanup

No match.