Remove unused injection
Handle paths better in Makefile
Fix elasticsearch detection in makefile