remove hard dependency on CMFDefault