Remove single value support