Re-work token destruction

Signed-off-by: David Celis <me@davidcel.is>