Remove unused local variables (part2 for master)