Stop using deprecated EDS API