wip: cleanup peering and bird

1 job for master in 3 minutes and 54 seconds