Fix #7160 - sort out comment removal and figcation error