OOIION-1741: Remove elastic search and simplify discovery service