Cleanup of COBScheduler code