[HOLMES] Remove AAF dependency and support SM

No match.