Get rid of token entity types, they are useless and hinder