Removes old comments, moves to 7.1