Makefile clean up