remove some uses of CMFDefault