Remove event group stuff.
Fix a small recent bug.
Authored by: dannybackx 2019-01-06
Parent: [r152]
Child: [r154]