cleanup trace module
Merge pull request #936 from ruil2/trace_cleanup

    cleanup trace module