Remove events
Merge remote-tracking branch 'origin/develop/remove_events'