Remove some unused variables.

A few more unused variables.
-Mark
Oops. Sometimes merges look trivial but they are not. It started being used again in fea6280bffbffbbedf67d6372bc5087338ebf3ef.  Will check merge properly and push again.