Fixed a fix for the deadlock fix
Removed job finish events - too much overhead