Minor cleaning up of unused variables.