Remove unused variables.
Merge branch 'master' into UserInterface