cleaned up traces