Too out scheduling
Merge pull request #417 from AZaitzeff/optim

Took out scheduling