remove unused variables

(This time, get rid of them)