@ethomson: This variable is set but not used anywhere. Can you double-check please?