Some cleaning of Makefile