Merge branch 'release/2.0.1' into develop
removed unsed code blocks
Merge branch 'develop' of https://github.com/ptdavteam/elasticsearch-approx-plugin