NXP-11921: Dependencies cleanup