Remove dependency on elasticsearch