bonding: api cleanup