Issue #2080343 by connork, izus, rahul.shinde, lokapujya | mrsinguyen: Remove Unused local variables from system module.