Get rid of unused variables