updated makevars, removed unused vars