small cleanup on elastic client