Remove unused variables

When unused variables had previously been used in now commented out code,
they were commented out as well instead of completely removed.
Remove commented out code
Remove commented out code
Merge pull request #2249 from knabar/flake8-cleanup-unused-vars

omeroweb flake8 cleanup: Remove unused variables