cleaning out events.xml
WIP
1638 left