Cleanup some unused variables.

Cleanup some unused variables.