Fix events cleanup conflict