Remove several unused variables