Remove unused tokens
Merge pull request #936 from dlsniper/fix-tests

Remove unused tokens