continue cleanup from kernel merge, align XAPI with new client  tracking