More removal of multi-value tags