cleaning up some traces

Cleaning up some "color" tags on traces. Now, special codes are inserted only if necessary.