Bug fix + Remove schedules folder