Clean up Makevars