NXP-13916: cleanup
NXP-13916: merge favorites modules with collections