ENH:  remove KIT specific fix and add general interface to events