Clean up token deletion.

Mostly remove dead code, rename variables.