Correctly separate IPv4 & IPv6 uplink detection
Remove abandoned CER-ID logic