Remove join event and fix event name