Fix unused variable warnings
Merge pull request #1140 from DonLakeFlyer/UnusedVariableWarnings

Fix unused variable warnings