A little cleanup, the scheduler is a little broken.