Re #7986 remove commented lines