adding event cleanup