Clean up scheduler event hooks
Fix ability to restart scheduler