remove dead code
clean the interface of tokenf
tweak
bring back the unittest ...
tweak