NXP-12487 cleanup