More makefile cleanup