Clean merge of cpu depth trace