Clean up and annotate CTM property files