Remove dependency on eco