Removed unused variables
Merge pull request #5182 from bcrowe/3.0-unused-vars

3.0 - Removed unused variables