Further makefile cleanup