Remove cache folder
Improved makefile