Remove extra vars