Minor tweaks to remove old comments