Cleaned up elasticsearch
Need to add logstash next