Variable Cleanup

Added some variable cleanup.  Not strictly necessary, but was added as
part of some bug hunting/troubleshooting, and I see no point in removing
it right now.