[mod] remove useless stuff
[mod] create Token instance out of hiden tokens
[enh] handle before and after hidden tokens