Issue #2080391 by johnmcc, Bladedu, chertzog, jeroen12345: Remove Unused local variables from multiple core files.