some cleanup in event