upgraded to elasticsearch 0.90.7 and clean up