More netlink cleanup