Add TODO to remove classes_timeslot (redundant)