Clean up date handling for events