Cleaned up traces