Tokens - remove commented code
minor #808 Tokens - remove commented code (keradus)

This PR was merged into the 1.3-dev branch.

Discussion
----------

Tokens - remove commented code

Commits
-------

0136f3b Tokens - remove commented code
WIP
WIP