Cleanup comments around delicate race