Better cleanup code for event summary