Remove unneeded variables

Many files affected, but all changes are small.  Just purging unused
variables...