Remove some unused variables.

A few more unused variables.
-Mark
This isn't unused - see line 131