NXP-14567: cleanup (Maven 3)
NXP-14571: cleanup (AAMP)