Some Makefile cleanup