Removing CDI event handling, to remove complexity