removed remnants
Merge branch 'remove-remnants' into validate-time-event