NXP-14140: cleanups