Revert "Remove unused variables..."

This reverts commit f73cf7cb2e5294de87bd879fc116036cd3a6a4cb.

I removed variables in wrong block... Sorry...