Cleaned up Scheduler
Cleaned up dispatcher calls