Clean old variables

I found a few unused variables while working on stuff.