remove conflicting wire color notes (again)