Makefile cleanup