Remove unused variables.
Merge remote-tracking branch 'origin/master' into gltf-8