Remove mandatory dependency from CMFCore