Unused variables are unused.

I guess pylint didn't catch them because they were top level.
Merge branch 'master' into lazers

Todo: l2git