Some more event cleanup