Remove all cmt files
This is a hand made cherry pick of !186 (merged) solving conflicts since some files had been modified between versions
This is a hand made cherry pick of !186 (merged) solving conflicts since some files had been modified between versions