Remove the ValueItem distinction