NXP-10968: cleanup old APIs