Clean up event log merge code