Remove cruft

Remove unused variables. I'll add them as I need them, otherwise I'll
likely forget they are there if I don't.