NXP-13916: decrease timeout + cleanup