Tokens - remove commented code