more event cleanup