Makefile cleanup fixed