Ditch elasticsearchjs, more tweaks