Fix ModelTraceApplicator
Cleanup traces