Re #6771 Some cleaning
Re #6771 Some cleaning
Re #6771 D33 working only in TOF mode