es-simple-query now uses the logstash util

Some refactoring to remove now unused vars/requires