Feature/poll tokens

We don't seem to use "z" after declaring it