[trunk] Removed unused variables