More unused variables?