Remove some unused variables

No other changes to the code.