Remove unused variables.
Tiny code beautifications.