Clean up of traces