each to each_value; remove unused vars
Merge pull request #10127 from vipulnsward/each_to_each_value

each to each_value; remove unused vars