Remove references to review-note

and other redundancies