unused variables got cleaned up when I found them too; these were found by pylint, not by eye