Remove superfluous top-level makefile vars