Remove last of TOKbit
Merge pull request #2728 from yebblies/tokbit

Remove last of TOKbit