Cleaning up traces