cleanup add generic Model2TRace , event2 trace and trace apply