clean up event data
Merge branch 'event' into develop