Use new ElasticSearch client
Clean up imports