More Makefile cleanup