Clean up some redundant variables from vars.mk.