Eliminating excess unused variables, to improve compiler warnings