polish unused variables