Remove redundant comments and include TODO regarding 'Course (all years)' level.