Unused local variables

Hi,

Some local variables were not use anymore.
I removed the unused variables that I can and unset the variables created in a list(...).

(Sorry for auto-removed spaces in first file...)