cleanup trace system, still need to fix compare tests
push