Remove dump/undump functionality from Tokens