CLN: Unused varables pt2
- [x] passes `git diff upstream/master -u -- "*.py" | flake8 --diff`

xref #21986

Remove more unused variables including ones that were marked in TODOs as unused.
All looks good besides a travis build that had connection issues.  thanks!