Fix for cleaning timetable and various improvements