And some more makefile cleanup