Remove some unused variables.

A few more unused variables.
-Mark