UnusedUse - rewrite to use Tokens