More ScheduleUploader cleanup