Events fixes
Merge pull request #40 from CTSATLAS/ccentral/event-cleanup

Events fixes