remove dependency on CMFDefault