Clean up config var.s