NXP-12876: cleanup - refactor