Re #7235 Remove unused ngsans code