Clean non-used variables

minor changes