removed all ICVPN and Bird stuff