Remove unused variables.
Merge remote-tracking branch 'origin/checked' into spike