Remove a couple of unused variables (thanks Olivier for the feedback)