removed obsolete event class
Merge branch 'api-simplify'