Cleanup and add bgpvpn to scenario file