did integration with ElasticSearch, removed a bunch of comments