[build-system] Remove unused variables.
Merge pull request #832 from waywardmonkeys/remove-build-system-variables

[build-system] Remove unused variables.