cleaning up some traces
Merge pull request #778 from dcoeurjo/traceupdate

cleaning up some traces