Remove unused variable; no functional change.
Removing more unused variables; no functional change.