NXP-14571: cleanup (AAMP)