more Makefile cleanup