More makefile trimming