NXP-12478: add log + cleanup