Change cleanup to remove trace files instead of removing directory