removed tmatch part of type_switch_old
adjust genneko
removed TMatch (mostly)