remove some unneeded variables
Merge pull request #2387 from hpohl/variables

remove some unneeded variables