Remove unused variables detected by Clang 4.2.
Merge pull request #416 from SaberUK/insp20+clang42-warnings

Remove unused variables detected by Clang 4.2.