Cleanup unused variables

[njansson]

Fix jwd2006i-i warnings (fj) for never referenced variables

Note: we still have unused dummy arguments (jwd2008i-i)