[REM-1] Removes JobEvents and makes better use of EventData