cleanup Makevars