Remove EMF ECP dependency