* Merge pull request #35429 from ShizCalev/snowdin-cleanup Var cleanup and map fixes * Var cleanup and map fixes