make it work with elastic 0.90.5
clean the imports