Remove dependency on CMFCore