NXP-11775 - cleanup & format; update deprecated usages
NXP-11775 - Remove CMF from startup Wizard