Removed old Scheduler again