remove some unused variables, and comments about them (less warnings from pyflakes)