Cleaned NaiveScheduler