Clean-up Makefile