NXP-15485: cleanup + wait where necessary