Cleaup and better handling of late events