[TIMOB-12364] Event listener cleanup